From: Bernd Schubert <bernd@bsbernd.com>
Date: Tue, 15 Jul 2025 21:54:27 +0000 (+0200)
Subject: [PATCH] fusermount: Fix the close_range ifdef
X-Git-Tag: archive/raspbian/3.17.2-3+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=21a5c51ad27e076b38bb87b1b7b4da0c231393f5;p=fuse3.git

[PATCH] fusermount: Fix the close_range ifdef

This fixes commit 82bcd818
That commit had removed HAVE_LINUX_CLOSE_RANGE in meson generation,
but didn't remove the usage in fusermount.c - fusermount was then
not using the close_range syscall.

Closes: https://github.com/libfuse/libfuse/issues/1284
Signed-off-by: Bernd Schubert <bernd@bsbernd.com>

Gbp-Pq: Name Fix-the-close_range-ifdef.patch
---

diff --git a/util/fusermount.c b/util/fusermount.c
index da6d5f2..dbd947c 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -36,7 +36,7 @@
 #include <stdbool.h>
 #include <sys/vfs.h>
 
-#ifdef HAVE_LINUX_CLOSE_RANGE_H
+#ifdef HAVE_CLOSE_RANGE
 #include <linux/close_range.h>
 #endif
 
@@ -1477,7 +1477,7 @@ static int close_inherited_fds(int cfd)
 	if (cfd <= STDERR_FILENO)
 		return -EINVAL;
 
-#ifdef HAVE_LINUX_CLOSE_RANGE_H
+#ifdef HAVE_CLOSE_RANGE
 	if (cfd < STDERR_FILENO + 2) {
 		close_range_loop(STDERR_FILENO + 1, cfd - 1, cfd);
 	} else {